Fixed layout padding
Code cleanup