fixed unclickable button issue, further layout cleanup