Restructure & refactor basic layout