improved layout
sandboxing partially implemented