Fix _this issue in controllers
Add placeholder functionality to directive
Add more markup and css