Fixing layouts and shiz