first commit
initial layout
updated styles
added down arrow
merge
fixed merge conflicts