Style and functionality changes