-editing layout a bit