Overhauled remaked layout