Added static bitmap image view layer + refactoring