This is how it should look now

or eventually how it will look like