More slim modification, fixed application layout