Couple more style fixes, fix for detecting user press