More layout improvements and the addition of icons and images