Added navigation dropdown, class reorganization