layout bugs, prepare for google play