added bottom_line_buttons
some bug fixes