Code clean up and frosted menu :)