improved layout fixed #5