Added custom annotations and rating bar
Reorganizing