Layout + code cleanup