- Row edited for better look & feel