fixed layout and added updwon