Fix theme nav

Fix theme nav - expand and align right