MAde css more dynamically correct; Added button(To Be Styled)
Merge remote-tracking branch 'origin/master'