REVIEW: Converted layout to slim