Made use of constants file. Changed menu to toolbar to remove gap issue.