Style changes. Took out unnecessary test buttons/old code