Small layout bugs fixed, updated database