Add up button
remove unnecessary layout in static fragments
fix bugs related to tablets