clean up top-right, change action from thunderclap to $
resolve conflicts
move style.css to assets folder
continued work on action section