Tighter positioning

#38