Major style and functionality changes