Fixed js concatenation and applied several tablet formatting fixes