added slimscroll, minor cleanup on layout
merge fix