Working on layout and documentation