Revamped Layout