Refactored, added circular imageview