Menu ordering and minor styling changes