Colour changes, top-container added, lookup from nav fixed