Work of 14/11/2014

Some work on UI