some basic styling done
bug fix