Removed Generics
Screen Boundries
Merged Arjun's changes
Merge branch 'arjungopisetty-master'