Restructure layouts + Add sidebar layout