Fixed arrow location
Updated layout
Even more layout improvement