Updated Application with basic window