pimped layout a bit