basic layout updates & ajax needs to be fixed