Visual fixes, use Bootstrap Grid System