Added code for custom views