Improve somethings on ayout