Added navigation, tidied some CSS