Edited layout system again