Updated with new clean layout

Clean layout