Reorganized site menu items and fixed some css issues