skeleton more done
Added Color and layout improvements