better JSPs

Change-Id: Ib1e77029df57cb93f283713baa851821031ebbfe