Layout fixed
Updated