Add the basic layout
Move settings into icons