Added some custome icons and rigged more layouts