changed some package names
some layout tweaking