Merge pull request #5 from taylorchiu/master

fixed header padding
deleted stuff
fixed conflicts
Modal working