Bootstrap wrapping
Removed iconic css from layout
Original buttons commented out
Merge pull request #231 from ralzakark/develop

Boostrap wrapping