Revamped layout