significantly fixed the static loading issue and layout stuff