More code cleanup, page styling