* Common code is moved to base template * Styles are made more accurate Change-Id: I65e11143c3fbe9fc7d4e620a521f7e5b22763e46