Used layout macro to remove view duplication