started basic styling
fixed merge conflicts