Further improving layout and interface
lots of changes