Better docs and layout