fixed small HTML bugs
changed content layout to use 6 columns layout instead of 4
added small TODO