cleaned up tabbing from last commit, and edited elements to be more semantically correct