Fixed layout issue
Fix text bottom cut-off and remove static Set 1