Merged

Merged design branch - not functioning fully but is a start. Also need
to find a way to add back framework CSS