Fix some bugs, improve layout and other small things of layout. Fix labels and icons