Added more correct DOM and CSS
Added some syntax sugar