Restructured markup & styling a little bit
Added todos