Twitter for UCI only
Entire site layout done
Merged conflicted files