Added scrollbar, adjusted buttons