fixed SELECT statement
small style adjustments
style adjustments/UI changes