Refactored and added new StaticView