Moved stuff
merged style to master