Added sizing based on window size.
merged changes