Fix controller test bug
Switch from Bootstrap to Foundation
Clean up code formatting