Working version, improved layout, improved performace