Make the code more readable.
Small modification in Layouts design.