Code cleanup, added custom base css