Bug fixes & aesthetic improvments