Cleaned up structure + CSS + Fixed JS