Moved most things inline to improve layout look and feel