Remake layout